Auto merge of #2691 - serprex:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 15 May 2016 01:43:48 +0000 (18:43 -0700)
committerbors <bors@rust-lang.org>
Sun, 15 May 2016 01:43:48 +0000 (18:43 -0700)
commit8bdec5eb4540692a2d17d67ae9cf6b262f956b1e
treeedbee843aaf12f0953ad14b474009bec7e2de92c
parent5cb2bb1b359497a140a23efed13e3099e6a18b3b
parent6083780ad849edde0534b0963420e3ea347566d6
Auto merge of #2691 - serprex:master, r=alexcrichton

Remove dependency on time in favor of std::time